From 6c9bfc5f3977ba6a161445f11e576fff7b7b4e67 Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@gnome.org>
Date: Thu, 10 Dec 2009 12:04:48 -0200
Subject: [PATCH] Make sure dist check works with introspection

We need to prepend the srcdir to all variables
passed into the scanner as it runs with srcdir != builddir during
distcheck.
---
 gdk-pixbuf/Makefile.am | 4 ++--
 gdk/Makefile.am        | 9 +++++++--
 gtk/Makefile.am        | 9 +++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 5741c2c835..90346fe384 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -698,8 +698,8 @@ GdkPixbuf-2.0.gir: $(INTROSPECTION_SCANNER) libgdk_pixbuf-2.0.la Makefile
 		--library=libgdk_pixbuf-2.0.la \
 		--libtool="$(LIBTOOL)" \
 	        --output $@ \
-		$(libgdk_pixbufinclude_HEADERS) \
-		$(libgdk_pixbuf_2_0_la_SOURCES)
+		$(addprefix $(srcdir)/,$(libgdk_pixbufinclude_HEADERS)) \
+		$(addprefix $(srcdir)/,$(libgdk_pixbuf_2_0_la_SOURCES))
 BUILT_GIRSOURCES += GdkPixbuf-2.0.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 326308609c..c579a8772c 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -187,6 +187,12 @@ libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(src
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
+introspection_files = \
+		$(gdk_public_h_sources) \
+		$(gdk_c_sources) \
+        gdkenumtypes.c \
+        gdkenumtypes.h
+
 Gdk-2.0.gir: $(INTROSPECTION_SCANNER) $(gdktargetlib) Makefile
 	$(INTROSPECTION_SCANNER) -v \
 		--namespace Gdk --nsversion=2.0 --strip-prefix=Gdk \
@@ -198,8 +204,7 @@ Gdk-2.0.gir: $(INTROSPECTION_SCANNER) $(gdktargetlib) Makefile
 		--library=$(gdktargetlib) \
 		--libtool="$(LIBTOOL)" \
 	        --output $@ \
-		$(gdk_public_h_sources) \
-		$(gdk_c_sources) gdkenumtypes.c gdkenumtypes.h
+		$(addprefix $(srcdir)/,$(introspection_files))
 BUILT_GIRSOURCES += Gdk-2.0.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index dfca39335e..ed1f5d7ed1 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -966,6 +966,12 @@ LDADDS =								\
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
+introspection_files = \
+    $(gtkinclude_HEADERS) \
+    $(gtk_all_c_sources) \
+    gtktypebuiltins.h \
+    gtktypebuiltins.c
+
 Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile
 	$(INTROSPECTION_SCANNER) -v \
 		--namespace Gtk --nsversion=2.0 --strip-prefix=Gtk \
@@ -980,8 +986,7 @@ Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile
 		-UGDK_DISABLE_DEPRECATED \
 		-UGTK_DISABLE_DEPRECATED \
 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \
-		$(gtkinclude_HEADERS) \
-		$(gtk_all_c_sources) gtktypebuiltins.h gtktypebuiltins.c
+		$(addprefix $(srcdir)/, $(introspection_files))
 BUILT_GIRSOURCES += Gtk-2.0.gir
 
 girdir = $(datadir)/gir-1.0
-- 
2.30.2